gdk/win32/gdkdrawable-win32.c Use correct casts in debugging output.

2001-03-19  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdrawable-win32.c
	* gdk/win32/gdkimage-win32.c: Use correct casts in debugging
	output.

	* demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
	gdkwin32.h.

2001-03-19  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in: Handle gdk-pixbuf-marshal.c.

	* gdk_pixbuf.def: Update.

	* pixbufloader_*.def: Just export the fill_vtable functions now.

diff --git a/ChangeLog b/ChangeLog
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 48a4736fe422f7686d64505ee9e646cb88305b74..c1e33e94f30e7664a7f3da9ecc723417b575110f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdrawable-win32.c
+       * gdk/win32/gdkimage-win32.c: Use correct casts in debugging
+       output.
+
+       * demos/testpixbuf-drawable.c: If GDK_WINDOWING_WIN32, include
+       gdkwin32.h.
+
 2001-03-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_window_state): New function.

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index aee537459b6c90eeed8a2108ce17a3e05d9430d8..28b5b7d1b4dc4b089188489022e7105a3be88099 100644 (file)
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,6 +1,10 @@
 #include <config.h>
 #include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/x11/gdkx.h>
+#elif defined (GDK_WINDOWING_WIN32)
+#include <gdk/win32/gdkwin32.h>
+#endif
 
 int close_app(GtkWidget *widget, gpointer data)
 {

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index feb54700ec466975b6030e8d53cfea9eec5c44de..e0a0f71c24d241cfb0ad1a1fa3e83d57345c8181 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+2001-03-19  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.mingw.in: Handle gdk-pixbuf-marshal.c.
+
+       * gdk_pixbuf.def: Update.
+
+       * pixbufloader_*.def: Just export the fill_vtable functions now.
+
 2001-03-18  Mike Kestner  <mkestner@ameritech.net>
 
        * make-inline-pixbuf.c (main): Added logic to remove output when

diff --git a/gdk-pixbuf/gdk_pixbuf.def b/gdk-pixbuf/gdk_pixbuf.def
index b6f89f1413be543601444ca665753a2dd767f04b..dc3ea4e2a263bbcf444d8ff0d93c53c2421330c6 100644 (file)
--- a/gdk-pixbuf/gdk_pixbuf.def
+++ b/gdk-pixbuf/gdk_pixbuf.def
@@ -1,4 +1,7 @@
 EXPORTS
+       _gdk_pixbuf_get_module
+       _gdk_pixbuf_get_named_module
+       _gdk_pixbuf_load_module
        gdk_pixbuf_add_alpha
        gdk_pixbuf_animation_get_frames
        gdk_pixbuf_animation_get_height
@@ -26,23 +29,17 @@ EXPORTS
        gdk_pixbuf_get_colorspace
        gdk_pixbuf_get_has_alpha
        gdk_pixbuf_get_height
-       gdk_pixbuf_get_module
        gdk_pixbuf_get_n_channels
-       gdk_pixbuf_get_named_module
        gdk_pixbuf_get_pixels
        gdk_pixbuf_get_rowstride
        gdk_pixbuf_get_type
        gdk_pixbuf_get_width
-       gdk_pixbuf_init
-       gdk_pixbuf_load_module
        gdk_pixbuf_new
        gdk_pixbuf_new_from_data
        gdk_pixbuf_new_from_file
        gdk_pixbuf_new_from_inline
        gdk_pixbuf_new_from_xpm_data
        gdk_pixbuf_new_subpixbuf
-       gdk_pixbuf_postinit
-       gdk_pixbuf_preinit
        gdk_pixbuf_ref
        gdk_pixbuf_saturate_and_pixelate
        gdk_pixbuf_save

diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in
index 3caef00726a4f78291481e2a3994111c358f63cc..30629261dc17483cdbcf1cb0b783075969652c47 100644 (file)
--- a/gdk-pixbuf/makefile.mingw.in
+++ b/gdk-pixbuf/makefile.mingw.in
@@ -28,7 +28,7 @@ all :                                         \
        pixbufloader-xpm.dll                    \
        make-inline-pixbuf.exe                  \
        test-gdk-pixbuf.exe
-       
+
 gdk_pixbuf_OBJECTS =                           \
        gdk-pixbuf.o                            \
        gdk-pixbuf-animation.o                  \
@@ -44,6 +44,11 @@ gdk_pixbuf_OBJECTS =                         \
 gdk_pixbuf-$(GDK_PIXBUF_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
        $(GLIB)/build-dll gdk_pixbuf $(GDK_PIXBUF_VER) gdk_pixbuf.def $(gdk_pixbuf_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(INTL_LIBS)
 
+gdk-pixbuf.o:: gdk-pixbuf-marshal.c
+
+gdk-pixbuf-marshal.c :
+       $(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >$@
+
 pixops/libpixops.a :
        cd pixops && $(MAKE) -f makefile.mingw libpixops.a
 
@@ -112,8 +117,10 @@ make-inline-pixbuf.exe : make-inline-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
 test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
        $(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS)
 
+ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
 # Hack to get an updated makefile.mingw automatically after updating
 # makefile.mingw.in. Only for developer use.
 makefile.mingw: makefile.mingw.in
        sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
            -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@
+endif

diff --git a/gdk-pixbuf/pixbufloader_bmp.def b/gdk-pixbuf/pixbufloader_bmp.def
index f11d3f3d2ac7ad6a518a7d9596dc5f1ee153b6a1..c71ac26ed8e5c3dfd787f32674c51d932ce4b467 100644 (file)
--- a/gdk-pixbuf/pixbufloader_bmp.def
+++ b/gdk-pixbuf/pixbufloader_bmp.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__bmp_image_load
-       gdk_pixbuf__bmp_image_begin_load
-       gdk_pixbuf__bmp_image_stop_load
-       gdk_pixbuf__bmp_image_load_increment
+       gdk_pixbuf__bmp_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_gif.def b/gdk-pixbuf/pixbufloader_gif.def
index 28ed9b710549f96d3ec011450e246c6a9131009b..c27069ea30263ad92d6f9bef9700449bb248c6d0 100644 (file)
--- a/gdk-pixbuf/pixbufloader_gif.def
+++ b/gdk-pixbuf/pixbufloader_gif.def
@@ -1,6 +1,2 @@
 EXPORTS
-       gdk_pixbuf__gif_image_load
-       gdk_pixbuf__gif_image_begin_load
-       gdk_pixbuf__gif_image_stop_load
-       gdk_pixbuf__gif_image_load_increment
-       gdk_pixbuf__gif_image_load_animation
+       gdk_pixbuf__gif_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_ico.def b/gdk-pixbuf/pixbufloader_ico.def
index 6bc5257a84a3d1f280bbae42a365885bb3baa862..b1d3306de67723d7a584bc696823dffca624e073 100644 (file)
--- a/gdk-pixbuf/pixbufloader_ico.def
+++ b/gdk-pixbuf/pixbufloader_ico.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__ico_image_load
-       gdk_pixbuf__ico_image_begin_load
-       gdk_pixbuf__ico_image_stop_load
-       gdk_pixbuf__ico_image_load_increment
+       gdk_pixbuf__ico_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_jpeg.def b/gdk-pixbuf/pixbufloader_jpeg.def
index ef1b771fa340c5347ff22a55e7c86cc03b686645..60576a11808e019186589fdd6b78b52f81c331d9 100644 (file)
--- a/gdk-pixbuf/pixbufloader_jpeg.def
+++ b/gdk-pixbuf/pixbufloader_jpeg.def
@@ -1,7 +1,2 @@
 EXPORTS
-       gdk_pixbuf__jpeg_image_load
-       gdk_pixbuf__jpeg_image_begin_load
-       gdk_pixbuf__jpeg_image_stop_load
-       gdk_pixbuf__jpeg_image_load_increment
-       gdk_pixbuf__jpeg_image_save
-
+       gdk_pixbuf__jpeg_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_png.def b/gdk-pixbuf/pixbufloader_png.def
index d24b346277293641236756081a0d92d7356a28e5..631185ad98da1690f98f2e4336e86198af26136d 100644 (file)
--- a/gdk-pixbuf/pixbufloader_png.def
+++ b/gdk-pixbuf/pixbufloader_png.def
@@ -1,6 +1,2 @@
 EXPORTS
-       gdk_pixbuf__png_image_load
-       gdk_pixbuf__png_image_begin_load
-       gdk_pixbuf__png_image_stop_load
-       gdk_pixbuf__png_image_load_increment
-       gdk_pixbuf__png_image_save
+       gdk_pixbuf__png_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_pnm.def b/gdk-pixbuf/pixbufloader_pnm.def
index b708d1cfc390e14fafadbf92b1ff1a33c5e52390..c322bc184d2e6e47af9039702d7991409ef2cdee 100644 (file)
--- a/gdk-pixbuf/pixbufloader_pnm.def
+++ b/gdk-pixbuf/pixbufloader_pnm.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__pnm_image_load
-       gdk_pixbuf__pnm_image_begin_load
-       gdk_pixbuf__pnm_image_stop_load
-       gdk_pixbuf__pnm_image_load_increment
+       gdk_pixbuf__pnm_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_ras.def b/gdk-pixbuf/pixbufloader_ras.def
index a4e3e043bc10f5b631fd8dee703e08201a6353e2..24732553b30a62c92c99aca1ca8fe9206bc04b1c 100644 (file)
--- a/gdk-pixbuf/pixbufloader_ras.def
+++ b/gdk-pixbuf/pixbufloader_ras.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__ras_image_load
-       gdk_pixbuf__ras_image_begin_load
-       gdk_pixbuf__ras_image_stop_load
-       gdk_pixbuf__ras_image_load_increment
+       gdk_pixbuf__ras_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_tiff.def b/gdk-pixbuf/pixbufloader_tiff.def
index 264d50ae4ba507dd52104b443d5cc92b16c17817..d3371bebb39a321e99f82e214294d4af549ea718 100644 (file)
--- a/gdk-pixbuf/pixbufloader_tiff.def
+++ b/gdk-pixbuf/pixbufloader_tiff.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__tiff_image_load
-       gdk_pixbuf__tiff_image_begin_load
-       gdk_pixbuf__tiff_image_stop_load
-       gdk_pixbuf__tiff_image_load_increment
+       gdk_pixbuf__tiff_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_wbmp.def b/gdk-pixbuf/pixbufloader_wbmp.def
index 9be84a5bc217475cb8388b3a6ff827a1143ec0af..701a3164e7a7ac24d496fb5b2f25f0bf9fd27efa 100644 (file)
--- a/gdk-pixbuf/pixbufloader_wbmp.def
+++ b/gdk-pixbuf/pixbufloader_wbmp.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__wbmp_image_load
-       gdk_pixbuf__wbmp_image_begin_load
-       gdk_pixbuf__wbmp_image_stop_load
-       gdk_pixbuf__wbmp_image_load_increment
+       gdk_pixbuf__wbmp_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_xbm.def b/gdk-pixbuf/pixbufloader_xbm.def
index c25979ed33572328719bf4fb17b84b6226b077e7..9072d085135c78ae271d7be3bc49b56270f3b8ad 100644 (file)
--- a/gdk-pixbuf/pixbufloader_xbm.def
+++ b/gdk-pixbuf/pixbufloader_xbm.def
@@ -1,5 +1,2 @@
 EXPORTS
-       gdk_pixbuf__xbm_image_load
-       gdk_pixbuf__xbm_image_begin_load
-       gdk_pixbuf__xbm_image_stop_load
-       gdk_pixbuf__xbm_image_load_increment
+       gdk_pixbuf__xbm_fill_vtable

diff --git a/gdk-pixbuf/pixbufloader_xpm.def b/gdk-pixbuf/pixbufloader_xpm.def
index 45bf96ce25a00bbb87219a1edc80923b6636c4c6..4fa66a4957c64e6782e4a11863f45dd91e082aeb 100644 (file)
--- a/gdk-pixbuf/pixbufloader_xpm.def
+++ b/gdk-pixbuf/pixbufloader_xpm.def
@@ -1,3 +1,2 @@
 EXPORTS
-       gdk_pixbuf__xpm_image_load
-       gdk_pixbuf__xpm_image_load_xpm_data
+       gdk_pixbuf__xpm_fill_vtable

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 0eb45ddb8cc24d7e32b0731da5ef50da13c7f528..e8381b4ce3c6f064547153110e06b0d95fcfceb9 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -228,7 +228,7 @@ gdk_win32_draw_rectangle (GdkDrawable *drawable,
   gboolean ok = TRUE;
 
   GDK_NOTE (MISC, g_print ("gdk_win32_draw_rectangle: %#x (%p) %s%dx%d@+%d+%d\n",
-                          (guint) GDK_DRAWABLE_HANDLE (drawable),
+                          (guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle,
                           gc_private,
                           (filled ? "fill " : ""),
                           width, height, x, y));
@@ -616,11 +616,11 @@ gdk_win32_draw_drawable (GdkDrawable *drawable,
   else
     src_handle = GDK_DRAWABLE_HANDLE (src);
 
-  GDK_NOTE (MISC, g_print ("gdk_draw_pixmap: dest: %#x @+%d+%d"
-                          "src: %#x %dx%d@+%d+%d\n",
-                          (guint) GDK_DRAWABLE_HANDLE (drawable),
+  GDK_NOTE (MISC, g_print ("gdk_win32_draw_drawable: dest: %#x @+%d+%d"
+                          " src: %#x %dx%d@+%d+%d\n",
+                          (guint) impl->handle,
                           xdest, ydest,
-                          (guint) GDK_PIXMAP_HBITMAP (src),
+                          (guint) src_handle,
                           width, height, xsrc, ysrc));
 
   hdc = gdk_win32_hdc_get (drawable, gc, 0);

diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 32c05702f55bd38773232d5d0f76b63f21868933..4c87a5742029426b3d72286afd603c65a580f25e 100644 (file)
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -348,7 +348,7 @@ _gdk_win32_get_image (GdkDrawable *drawable,
   g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL);
 
   GDK_NOTE (MISC, g_print ("_gdk_win32_get_image: %#x %dx%d@+%d+%d\n",
-                          (guint) GDK_DRAWABLE_HANDLE (drawable),
+                          (guint) GDK_DRAWABLE_IMPL_WIN32 (drawable)->handle,
                           width, height, x, y));
 
   impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);